Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 20 Feb 2012 03:41:52 +0000 (19:41 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 20 Feb 2012 03:41:52 +0000 (19:41 -0800)
commitfec3d855579b9af1fdccab6875bba8f9908921c5
tree5c7cae09039e7c15455d63e37b98abbb353c019e
parent467d9fc8f0bb9fd6e755e9a6def9959ccce53e02
parent0235cb90c99cdd89901ad3c6c2f936a384db60fe
Merge from trunk.